Skip to content

把 release/0.41 并回 main(0.41.1) - #186

Merged
qiyinxi merged 3 commits into
ModAVD:mainfrom
qiyinxi:merge/release-041-0411
Nov 16, 2026
Merged

qiyinxi merged 3 commits into
ModAVD:mainfrom
qiyinxi:merge/release-041-0411

Conversation

@qiyinxi

@qiyinxi qiyinxi commented Nov 16, 2026

Copy link
Copy Markdown
Member

把 release/0.41 并回 main(0.41.1),代替 #185。

changelog.d/memory-8g.feat.md 两边都是新加的(main 上是 #181 加的原文,release/0.41 上 #184 在行尾补了 #181),直接并会冲突。这里从 main 并进 release/0.41,冲突取发版分支那份;并完的树和 release/0.41 的头 d24afa8 相同。

合的时候用 Create a merge commit,不用 squash。

Refs ModAVD/ModAVD#175

qiyinxi and others added 3 commits November 16, 2026 13:18
发版分支用 squash 合,汇总工具会把这一行算到发版 PR 上;行尾自己写上原 PR。
changelog.d/memory-8g.feat.md 两边都是新加的,取 release/0.41 那份(行尾带 ModAVD#181,见 ModAVD#184)。
@qiyinxi
qiyinxi merged commit 0c14c33 into ModAVD:main Nov 16, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant